From: Miles Bader <miles@gnu.org>
Date: Sat, 28 Feb 2004 22:45:01 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23883
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1bd6e61407935f55cc32e67655051076d1eeffd2;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index d7d8a0f58b2..cc692c1f975 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -734,3 +734,4 @@ ACTION and ARG should be legal convert command."
 ;;; thumbs.el ends here
 
 
+;;; arch-tag: f9ac1ef8-83fc-42c0-8069-1fae43fd2e5c